Merge from trunk.
authorEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:51:13 +0000 (19:51 +0200)
committerEli Zaretskii <eliz@gnu.org>
Mon, 9 Dec 2013 17:51:13 +0000 (19:51 +0200)
commitc30797c3030586666a0a5fa63a0ea6afb38327bf
treeea695d8f65ef2ce2b2d863e221dd6fd0e88f1028
parent1d15c5d5b0df7cb61e2c44ebfeab074d75840eff
parent98d2f19c4d4b88c3e105a68b22fee671a6d4d420
Merge from trunk.